Auto merge of #1616 - sbeckeriv:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
committerbors <bors@rust-lang.org>
Sun, 17 May 2015 20:30:03 +0000 (20:30 +0000)
commitac61996f8d4f8ab0df2e11bd9ba4de9279498360
treec1f8797c55942bbe0a21fdab0cf9c95a3a7fc837
parentc60f58568d7098a720b9614a2d1f2f05acc41761
parent372e9d60b924a6075098765ee27d40023874c357
Auto merge of #1616 - sbeckeriv:master, r=alexcrichton

This resolves #1379
src/cargo/util/toml.rs
tests/test_cargo_compile.rs